hvm: Fix acpi processor id in MADT LAPIC entries.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c
index 3890bc3166fd3f0d5fc0e54857f31d48067e77b7..cb4d1fa55cef24f9c126e36ed93c0fa9041313d2 100644 (file)
--- a/tools/firmware/hvmloader/acpi/build.c
+++ b/tools/firmware/hvmloader/acpi/build.c
@@ -110,7 +110,9 @@ int construct_madt(struct acpi_20_madt *madt)
         memset(lapic, 0, sizeof(*lapic));
         lapic->type    = ACPI_PROCESSOR_LOCAL_APIC;
         lapic->length  = sizeof(*lapic);
-        lapic->acpi_processor_id = lapic->apic_id = LAPIC_ID(i);
+        /* Processor ID must match processor-object IDs in the DSDT. */
+        lapic->acpi_processor_id = i;
+        lapic->apic_id = LAPIC_ID(i);
         lapic->flags   = ACPI_LOCAL_APIC_ENABLED;
         offset += sizeof(*lapic);
         lapic++;